From fd053cb4411a79cc801f87e782130c313ee10231 Mon Sep 17 00:00:00 2001
From: Jonathan Yavner <jyavner@member.fsf.org>
Date: Fri, 29 Sep 2006 02:42:39 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46888880d81..71792ae76fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -82,7 +82,6 @@
 	continued lines.
 	(line-move-1): Remove flawed test for that case.
 
->>>>>>> 1.10122
 2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* icomplete.el (icomplete-simple-completing-p): Use the correct
-- 
2.30.2